From 5fc7c872dd1d61396d210b78b66e18db929f04d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 19 Jul 2021 18:20:08 +0200 Subject: [PATCH] debian/rules: Use Enable auto-features for debs and disable them for udebs Avoid listing managing this manually, while explicitly disable or enable when something is required. --- debian/rules | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/debian/rules b/debian/rules index 8866cdf7d3..66da0f4ee3 100755 --- a/debian/rules +++ b/debian/rules @@ -75,15 +75,13 @@ configure_flags_common = \ ${NULL} configure_flags_deb = \ + --auto-features enabled \ -Dbroadway-backend=true \ -Dcloudproviders=disabled \ - -Dintrospection=enabled \ -Dman-pages=true \ -Dmedia-ffmpeg=disabled \ -Dmedia-gstreamer=disabled \ - -Dprint-backends=all \ -Dx11-backend=true \ - -Dxinerama=enabled \ ${NULL} ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) @@ -93,7 +91,6 @@ configure_flags_deb += -Dcolord=disabled endif ifeq (linux,$(DEB_HOST_ARCH_OS)) -configure_flags_deb += -Dvulkan=enabled configure_flags_deb += -Dwayland-backend=true else configure_flags_deb += -Dvulkan=disabled @@ -121,19 +118,14 @@ configure_flags_deb += -Dinstall-tests=true endif configure_flags_udeb = \ + --auto-features disabled \ -Dbroadway-backend=false \ -Dbuild-examples=false \ - -Dcloudproviders=disabled \ -Ddemos=false \ -Dinstall-tests=false \ -Dwayland-backend=false \ -Dx11-backend=true \ - -Dxinerama=disabled \ - -Dintrospection=disabled \ - -Dprint-backends=none \ - -Dcolord=disabled \ - -Dmedia-ffmpeg=disabled \ - -Dmedia-gstreamer=disabled + $(NULL) %: dh $@ --with gir --buildsystem=meson -- 2.30.2